From dea1048d11a1613ca3c4519ba0559f583054e00b Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Fri, 16 Oct 2009 08:35:21 +0100 Subject: [PATCH] xend: Check no VBDs attached on VDI.destroy We can destroy a VDI by VDI.destroy even if the VDI is being used to VBDs. This patch checks that the VDI is not used to VBDs. Signed-off-by: Masaki Kanno --- tools/python/xen/xend/XendAPI.py | 6 ++++++ tools/python/xen/xend/XendError.py | 12 ++++++++++++ 2 files changed, 18 insertions(+) diff --git a/tools/python/xen/xend/XendAPI.py b/tools/python/xen/xend/XendAPI.py index 975766bcd7..a489db01b1 100644 --- a/tools/python/xen/xend/XendAPI.py +++ b/tools/python/xen/xend/XendAPI.py @@ -2370,6 +2370,12 @@ class XendAPI(object): # Object Methods def VDI_destroy(self, session, vdi_ref): + # check no VBDs attached + image = XendNode.instance().get_vdi_by_uuid(vdi_ref) + if image.getVBDs(): + raise VDIError("Cannot destroy VDI with VBDs attached", + image.name_label) + sr = XendNode.instance().get_sr_containing_vdi(vdi_ref) sr.destroy_vdi(vdi_ref) return xen_api_success_void() diff --git a/tools/python/xen/xend/XendError.py b/tools/python/xen/xend/XendError.py index c0b0076525..a78f5f4f08 100644 --- a/tools/python/xen/xend/XendError.py +++ b/tools/python/xen/xend/XendError.py @@ -186,6 +186,18 @@ class DirectPCIError(XendAPIError): def __str__(self): return 'DIRECT_PCI_ERROR: %s' % self.error +class VDIError(XendAPIError): + def __init__(self, error, vdi): + XendAPIError.__init__(self) + self.vdi = vdi + self.error = error + + def get_api_error(self): + return ['VDI_ERROR', self.error, self.vdi] + + def __str__(self): + return 'VDI_ERROR: %s %s' % (self.error, self.vdi) + from xen.util.xsconstants import xserr2string class SecurityError(XendAPIError): -- 2.30.2